Adjust offset and add null 417