bug fix: if offset == 0, must use goto/32
Merge branch 'toDexBug' into develop