We may have finally fixed this