Fixup dispatching
Release v0.0.9