cleanup messges and fix #1009