Convert #629629 to Flügger