Convert #352391 to Flügger