The fix is a bit hacky, but it's very simple. In addition, it still does not handle the case where the receiver is a lambda function. But such case seems to be fairly rare in practice.
Tianyu Geng