fixed issues (AGAIN!!!)