Convert #376586 to Flügger