Fixing 1293
Merge pull request #587 from einhverfr/1.4

Fixing 1293