Fix bug with setting old properties