Fixed problem with partial overlap