Fix Shepherd. event binding