Convert #541529 to Flügger