Convert #619985 to Flügger