Fixing minor events bug with temporary patch
Re-build data-bind