fix for CEP-599 issue