Convert #541419 to Flügger