Improvement for non executed commands