re-apply title length patch from e1c4667aaf5a51979aab0419ddc5e06acc46a481