this fix works sometimes, but still fails