fix for 1.4.9-rc1
Merge pull request #574 from einhverfr/1.4

fix for 1.4.9-rc1