(I know this isn't something new on this branch, but) base->based.  Probably this happens other places like in draw(), as well.