fixing 1304.2
Merge pull request #597 from einhverfr/1.4

fixing 1304.2