Treasure hunt fix (Again)