Use fixed core-list fix.