Convert #337611 to Flügger