multiple messages bug fixed