Fix for KMS-2115