#CEP-70 fixed