Fixing issues 143 and 156