Fixing bug 1208
Merge pull request #331 from einhverfr/1.4

Fixing bug 1208