fxed case issues