Fix legacy by moving to hex