[PATCH] Fix empty command bug