Fixed boundry issue