Bug fixxed part1