Fixed new changes