Yeah, I know, this is a double fix until we have a solid test or a way to reproduce the issue and fix it definetively.