Fixing subgraphs to work with disabling of callbacks
Merge pull request #31 from Obvious/jeremy-bugs

Fixing subgraphs to work with disabling of callbacks