fix deliver issue and message