Convert #521339 to Flügger