Convert #654530 to Flügger