#CEP-60 fixed