another regression fix from Jonathan Wilkes