Fixed callback issue