Convert #438207 to Flügger