Fix for issue #37