Fix for issue #126