Fixed bad command delegation