fixed bug!!