Fixed deps and reset after fail