Fixed weird button message bug