bug fixxed