Need to fix hash issues