fixed bug?????