Fixed issue125

Fixes issue125