Possible fix for issue #32