Fixed all msg over lapping