Fixed new issues