Fix the overlay problem