Fix cyclic require
v0.0.1