Fixing Case issue