Convert #541525 to Flügger