Fixed avijit's mistakes