Fixed callback usage