fix overlay management