Fix an issue introduced by the new with() stuff.
Merge pull request #51 from vlucas/bugfixes

Fix an issue introduced by the new with() stuff.