Attempt at fixing command issue.