Admittedly this change might be superfluous.