fixed all issues (?)