fixed over write issue