solved some corner cases
v0.6.2