Treasure Hunt fix