Fixing issues when getting a message before the previous data comes through