Fixed bug with nullable associations