Fix null features, issue 358