fix for CaSe issues