Fixed commands breakage