added fixes for issue 461 to support long count
39 files changed