#CEP-107 fixed