Fixed callback handling.