Projectkk2glider/issue 1345

Possible fix, needs testing.