Convert #541576 to Flügger