Fixed bug for new mode