Fixing bug 1263
Merge pull request #492 from einhverfr/1.4

Fixing bug 1263