Fix Count and Value methods