Ioan fix attempt