Convert #653396 to Flügger