Convert #541633 to Flügger