#114 - Fix onChange Event error