Fix CommandBed for good?