Fixed values from being passed as null