Fix for issue #114