Fix for issue 123

This change is supposed to fix issue #123