HAMA-760: fix boundary condition problem