Convert #597828 to Flügger