fix none issue