Convert #521548 to Flügger