Should no longer result in null additions