The same fixes as in the 1.4.1 version for J!2.5