Bugfix: Problems with terms longer than 7 chars fixed