Fixed null hash issue