Fix dispatching condition for no group