Fixed commands not being "valid"