Convert #540629 to Flügger