fixed count issue based on timezone