Added fix for embedded belongsTo relationships (issue #49)