First pass at fixing error #2006