Replace TODO exception by github isssue #2