Merge pull request #1172 from bloomberg/trouble_shooting_slow

fix pathlogical bactracking behavior

Author: bobzhang