Deal with the issues raised by ato