Convert #619906 to Flügger