Adding a TODO comment in join elemernt code