Fixed the second part of the branching/callback issue.