Add Doug's fix