Convert #438538 to Flügger