Convert #521954 to Flügger