Properties fixed