Fixes: #2869 Shortening diff with 1.0.8