Fixing the -k option to store more of the data