Fixed bug : group function with condition dose not work