[FOLD] bind_handler fix
[FOLD] bind_handler fixes