Fixing issue #170
Fixing issue #168