Fixing issue #140 and #135