fixxed a bit