Minor update from .18