Convert #653394 to Flügger