Fixed monkey patch call. Added additiona assertion conditions.