Fix previous commit

Was untested, is still untested.