Another conflict I'd thought I'd fixed...