Added logic to make sure that the result is in Yakima