Added control when data-hash is undefine