[0.1.2] Overlay fix