fix dependency order
one more shortcircuit
release 0.4.2