Fix simple property replacement