fixed None vs False problem