Removed check on properties.id == -1