Fix: Issue with commands