Fixed callback processing