Added workaround for arbitrary suffix support