FIX: Member's trigger problem
FIX: Contract's trigger problem