Fixed callback management