Convert #564337 to Flügger