A bug fixxed