Fixed a problem with build_hash_table() getting called too