I agree with you but I did not want to make a big impact on codebase and I considered fact that this code is not called during the gameplay but only on the start ... but ok, I will fix that :)