Convert #521629 to Flügger