small fix for CEP-599