return to v0.3.5 alpha