Convert #521479 to Flügger