Improve more the bug prevent