Add patch from the ticket to fix #3149