fixes issue #373
Merge pull request #374 from davecranwell/fix/373

fixes issue #373
Changelog for #374
Changelog for #369