#CEP-109 fixed