fixed bug, still not working