added todo error fix