Few corrections on bug