Convert #619087 to Flügger