Convert #653367 to Flügger