Fixing overlap issues