Fixed none bug