Fixing 1283
Merge pull request #551 from einhverfr/1.4

Fixing 1283