Convert #521497 to Flügger