Convert #436370 to Flügger