Fix issue by compiling the property for partial data
Fix coverage issues