Fixed and removed --override switch