Fixed javierrors pt. 2