Fix more overlay issue