Fix for issue #35