Convert #517389 to Flügger