fixed #CEP-271 #CEP-325