fix callback failure case / make a bit cleaner