added a TODO for the next release