Fixed bug blocking spmd