Is this TODO going to be fixed? If not, then comment should be removed, or maybe changed to "FUTURE".