Fixes #1458 - 64k was hardcoded