#CEP-67 fixed