Convert #653281 to Flügger