Convert #516517 to Flügger