Convert #654590 to Flügger