Fix data wrapping for properties