Convert #359395 to Flügger