JAL-1260 v2 patch from David Roldán-Martínez