fix for KMS-982