Convert #338654 to Flügger