Bug fixxed