Convert #721379 to Flügger