fix noNulls