Same fix as went into 2.2 (I'm waiting for jerry to finish some code).