Refixed the bug #2
Update for version up 1.2.2