remove bug for tracking