Fix where prop.default was null