Possibly fixes issue #17

Probably fixes issue #17 although could do with testing on more than my
single development system.