Fix bug with Logger
Optimise