Fix: be less restrictive on callback validation