Hopefully this fixes the issues.