Fixing issues #117 and #119