Convert #521858 to Flügger