Convert #541297 to Flügger