Convert #521578 to Flügger