Overlay fix #1

Change-Id: I48ae185a5030b1e0dd8332549d970a2aa44bd6d6