Fix Caifornia return not working