Convert #467455 to Flügger