Convert #541638 to Flügger