Fixing regression while introducing ignore_list