fix border moving with some handler