Fixes #2063