fix for issue 31

fix for issue #31