partially fixes boundary bug