#CEP-112 fixed