Convert #341721 to Flügger