Bug in renewed command scheme is fixed.