Fix a bug that adapted message may not be used