Fixing issues # 83 and 84