fix overlay bugs introduced in last fix.