Fix for issue #129