fixed #CEP-204