Fixing: CID 1204077, CID 1204078, CID 1204079, CID 1204082, CID 1204081, CID 1204080