i'd better fix this, too