Convert #613951 to Flügger