callbacks bug fixed