Improve encoder bind logic.
0.1.25