fixed javierrors