more hash fix 2