Fixed double callback error

Calling a callback does not mean return -.-
Inserted a return after corresponding callback calls