Convert #721481 to Flügger