Remain few bugs