fix new issues