Remove dependency and fix code problem on a fresh install.