diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
index 70dd2c14..cde47a33 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
@@ -112,10 +112,10 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
     private fun initModel() {
 
 		val row = config?.row
-			?: (requireActivity() as? BaseActivity)?.bottomSheetViewModel?.rowRepresentable
+			?: (activity as? BaseActivity)?.bottomSheetViewModel?.rowRepresentable
 			?: throw PAIllegalStateException("row not found")
 		val delegate = config?.delegate
-			?: (requireActivity() as? BaseActivity)?.bottomSheetViewModel?.delegate
+			?: (activity as? BaseActivity)?.bottomSheetViewModel?.delegate
 			?: throw PAIllegalStateException("delegate not found")
 
 		val factory = BottomSheetViewModelFactory(row, delegate)
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt
index c98b5ed3..d8302698 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/BottomSheetViewModel.kt
@@ -16,7 +16,7 @@ import java.util.*
 
 class BottomSheetViewModelFactory(var row: RowRepresentable, var delegate: RowRepresentableDelegate): ViewModelProvider.Factory {
 
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
         return BottomSheetViewModel(row) as T
 //        return modelClass.getConstructor(RowRepresentable::class.java).newInstance(row)
     }