Fixes #2021