Convert #618126 to Flügger