updated fix, removed mutex