Bug fix, dispatch needed to return as well.