hotfix for suffix bug