Reworking fix from 1.3
Merge pull request #204 from einhverfr/1.4

Reworking fix from 1.3