Fix for Property to column mapping