fixing overlap