Monkey patch should use class instead lambda #28