Convert #521231 to Flügger