[FOLD] bind, wrap handler fixes