Fixes #110: problem now returns first and last token instead of single token