Convert #623243 to Flügger