fixed bug, working