Convert #721317 to Flügger