hotfix for Elshiko