possibly fixed all issues