Fix buggy overlap