Enhancement: more correctly detect uncertainty