Fixing a case issue... again2