[*] FO : Prevent adding a hash when not needed