resolved issue on TODO