Made sure not to break other usages.