FS-28 hash saving, bug fix