fix callback argument handlings