#CEP-78 fixed