hack to fix combo data loss