Temp hack to workaround backend bug