Fixes #2783