Fix CommandBed - *should* close #876