fixing no-nulls