Fixed overlapping between

* 007-1
* 010-1
* 016-1