Fixed the issue on the issues list
Updated ntentan to reflect new changes