Partial fix, still investigating