Fixing bug 1260
Merge pull request #494 from einhverfr/1.3

Fixing bug 1260