Fixed new issue