Fix resource tracker issue