diff --git a/App/Milkshake.dmg b/App/Milkshake.dmg
index 0c98ea5..a8afbb2 100644
Binary files a/App/Milkshake.dmg and b/App/Milkshake.dmg differ
diff --git a/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate b/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate
index fc19975..ee4be28 100644
Binary files a/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate and b/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 8163700..70d4b9e 100644
--- a/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -76,8 +76,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "52"
             endingLineNumber = "52"
-            landmarkName = "actionSelectedCell(sender:)"
-            landmarkType = "7">
+            landmarkName = "unknown"
+            landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
diff --git a/Milkshake/Info.plist b/Milkshake/Info.plist
index c4ddd4b..184e6c6 100644
--- a/Milkshake/Info.plist
+++ b/Milkshake/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>1.3.1</string>
 	<key>CFBundleVersion</key>
-	<string>41</string>
+	<string>42</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.music</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Milkshake/MainViewController.swift b/Milkshake/MainViewController.swift
index fe63984..ba1ca4b 100644
--- a/Milkshake/MainViewController.swift
+++ b/Milkshake/MainViewController.swift
@@ -274,7 +274,7 @@ class MainViewController: NSViewController {
                         let cell = rvc.searchTableView.view(atColumn: 0, row: i, makeIfNecessary: false) as! SearchTableCellView
                         if (
                             // skip shuffle banner
-                            !cell.item.isShuffle! && (
+                            !(cell.item.isShuffle ?? false) && (
                             // check song
                             cell.item.pandoraId == music.curPlayingItem.pandoraId ||
                             // check station
@@ -537,7 +537,7 @@ extension MainViewController: CellSelectedProtocol {
             }
         }
         else if type == MusicType.SHUFFLESTATION {
-            if item.isShuffle! {
+            if item.isShuffle ?? false {
                 if !self.appDelegate.radio.isShuffle {
                     self.appDelegate.api.shuffleStation(stationsIds: [], callbackHandler: callbackShuffle)
                 }
diff --git a/README.md b/README.md
index b2d95e3..91fc33a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Milkshake is a Mac OS X [Pandora](https://www.pandora.com) client.
 
 If you don't have a Pandora account, you can [sign up here](https://www.pandora.com/account/register)
 
-# Download v1.3.0
+# Download v1.3.1
 [💾 DMG Installer](https://github.com/skiptomyliu/milkshake/raw/master/App/Milkshake.dmg)