Updated setup script
Bug fix