A fix for issue #26

This should resolve issue #26