FIX: Safer parallel use