Fixed todo issue