Fixing 1267
Merge pull request #516 from einhverfr/1.4

Fixing 1267