Convert #541983 to Flügger