#148 fixed minor issue with FF and RW boundaries