fix on ApiMessage usage