KRACOEUS-6958: resolving conflict introduced by pull request #14, this time correctly