Enhancement made while debugging