Bug fix: some messages were getting lost.