* Fix overlap issue