Convert #332947 to Flügger