Don't overrun the buffer when the length requested is less than the filesize
Workaround no longer required