Fixing when nil