try to fixed todo