Issue 234 internal zdb

See #234.