Add hack to make things sync