Fix NONE bug