Convert #623402 to Flügger