Improved reliability, fixed multiple message error