Fixing columns issue for all relationships other than BelongsTo (Closes #151)