Hopefully fix even more problems