fixed #CEP-216