Convert #407638 to Flügger