Convert #620485 to Flügger