Convert #541489 to Flügger