fixing message push condition