Fixes #2643