fixed #NTR-319