Fixed potential problem with using None