Convert #614606 to Flügger