fixed hashtable
fixed const folding