Better handling of the container STOPPED state