Convert #336749 to Flügger