Arrow Count Bug Fix