Bug fixed on C9,C10