Yet another fix for large data