Improve handling of position uniqueness of theory