fixxed case bugs