Added monkey patch