fixed case bugs