Convert #623936 to Flügger