Better support for unkown state