#9 Fix deleting geometry also deletes variable