Convert #541614 to Flügger