Does this patch fixes the problem @borjasalguero ? if yes, let's r+ this and move on.