Convert #521626 to Flügger