added critical todo bug that has been found