Convert #623928 to Flügger