Fixing some stupid problem I created
Optimisation