FIX: attachment persistence