Convert #618471 to Flügger