Fixed callback compatibility