Convert #613507 to Flügger