Try to reorgnize after-scan callback