quick hotfix for SWAHILI 121-1