diff --git a/src/__tests__/mapping.test.ts b/src/__tests__/mapping.test.ts
index 1301732..40cc3f4 100644
--- a/src/__tests__/mapping.test.ts
+++ b/src/__tests__/mapping.test.ts
@@ -8,6 +8,7 @@ import {
     defineString,
     WrappedMappingData
 } from '../';
+import { AttributeDefinition } from '../mapping';
 
 chai.use(chaiAsPromised);
 
@@ -38,7 +39,9 @@ describe("Simple typed SQL mapping", function () {
 
         let mappingData = WrappedMappingData.getMappingData(mapping);
         let fooAttributeDefinition = mappingData.getAttributeDefinition('foo');
+        let fooAttributeDefinition2: AttributeDefinition = mapping.foo as any;
         expect(fooAttributeDefinition.mapping).to.equal(mapping);
+        expect(fooAttributeDefinition2.mapping).to.equal(mapping);
     });
 
     it("should error on property set attempt", async function () {
diff --git a/src/mapping.ts b/src/mapping.ts
index 0d3ff5a..930726b 100644
--- a/src/mapping.ts
+++ b/src/mapping.ts
@@ -169,7 +169,7 @@ function wrapMappingData<T>(mappingData: BaseMappingData<T>) {
     for (let prop of mappingData.getAttributes()) {
         Object.defineProperty(wrapper, prop, {
             enumerable: true,
-            get: () => mappingData.getAttributeDefinition(prop)
+            get: () => wrapper.getAttributeDefinition(prop)
         });
     }