Adjust logic to avoid changing binary form

Adjust logic to avoid changing binary form #754