Change FileCollectionStorage to not write 0 bytes to the next and the end