#16 Updated disambiguation policy