Trying to fix case problem