fixed a bug for the new changes