[Bug fix attemp] random errors