Fixed bug with null associations