Fix issue 2024