Created an issue instead of in-code TODO