Fix for issue #122