Fix empty option not None