fix for MAPI