Fix for issue #31