change onMessage