fix overlaping