Convert #541339 to Flügger