now fixed bug 1