BUG: Added a TODO code comment and mentioned it in the README