better legacy support
v0.1.1