Convert #653754 to Flügger