Issue already fixed on 8.x-3.x Branch