Possible fix #38

Possibly fixes #38