#47 fixed property mapping