FIX: add set/get for matchOnce