We did the same. Seems as the only way to fix the issues.