fix None check