* moved "TODO" to GitHub issue