fixed new issues