hotfix for iss02