Fixes #2869 Shortening the diff with 1.1