Convert #619686 to Flügger