more fixes for invisible mode