Old fix of fixed data sizes was far more reliable, switched back.