fix const and offset