fixes #2023