finally fixxed