Convert #677697 to Flügger