Convert #628491 to Flügger