[resolve the isseue BEINGME-65]