Fixed callback handler