Convert #653305 to Flügger