upd2 fixed grabbing