1 bug fixxed