Fixed nil options warning