Fixes #2921