Seemd to be even more problems, hopefully this will fix it