tested fixes