Convert #336803 to Flügger