fixed bug, all working