fixing bug with early message sending