Convert #628586 to Flügger