Proposed fix for associated objects always fetched from database (Issue #93)