fixing 1298
Merge pull request #589 from einhverfr/1.4

fixing 1298