Fix for issue #32