Bug-12 fixed of v1.0.0