fixed #CEP-321