Fix to uppercasing