fixed case issues