fix one part of #2024