Fix with callbacl