hopefull fixing all issues