Bug and contradictions has been fixed