fixed callback problem