Convert #721623 to Flügger