fixed return value of the callbacks