Fixed issue where data could be too long