Fixed command splitting issue