Convert #653178 to Flügger