Corrected handling of always calc hashes flag