Trying to fix case problem (2)