Fixes #2034