replaced -1 constant with null