Error fixing
v0.1