Actually fix command detection