Fix for issue #118