Fix bug discover by osaris