Fixed a small issue with separators being counted in when they shouldn't have been.