Ensure current_hash is set properly