Corrects somes scenarios that were failing.