1_6 fixed on border cases

Signed-off-by: aLekSer <gdocse@gmail.com>