Fixxed errors