Convert #366307 to Flügger