Fixed behavior for empty command
Fixed behavior for empty command