Fix overlay issue