#296 better find value