Fix for issue #120