fixed bug 1
merge with fixed 1