Another attempt at fixing...
Another try