Fixed nil? to none?