Convert #653582 to Flügger