Pablo Guerrero

Any updates on this? it would be good to have it merged

Can this be reviewed and merged please? I can confirm that the issue is happening, and this commit fixes it