bug fixins