The equivalent fix for of1.2 is the commit 3d90147. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>