Fix for issue #102