Convert #569424 to Flügger