Fix border layer's add timing.