Old commands delivery fix