Disable boundary setting for bug fix