Fixed callback composition