Fixes: #2731 Fix the 1.0.8 branch work