fixed #CEP-339
fixed #CEP-341