Convert #387526 to Flügger