Reverted back NON to None for backward compatibility
close #175