fix bug 01
merged fixed bug 01