Encapsulate Property: Post constraint fixes