fixed hexas
merge