diff --git a/BSModalPickerView/BSModalPickerBase.m b/BSModalPickerView/BSModalPickerBase.m
index 453008e..988851d 100644
--- a/BSModalPickerView/BSModalPickerBase.m
+++ b/BSModalPickerView/BSModalPickerBase.m
@@ -42,6 +42,9 @@ - (UIView *)picker {
 
         _picker = [self pickerWithFrame:pickerFrame];
         _picker.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
+        if (floor(NSFoundationVersionNumber) > NSFoundationVersionNumber_iOS_6_1) {
+            _picker.backgroundColor = [UIColor whiteColor];
+        }
     }
 
     return _picker;
@@ -64,7 +67,11 @@ - (NSArray *)additionalToolbarItems {
 - (UIToolbar *)toolbar {
     if (!_toolbar) {
         _toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, BSMODALPICKER_TOOLBAR_HEIGHT)];
-        _toolbar.barStyle = UIBarStyleBlackTranslucent;
+        if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_6_1) {
+            _toolbar.barStyle = UIBarStyleBlackTranslucent;
+        } else {
+            _toolbar.barStyle = UIBarButtonItemStylePlain;
+        }
         UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
                                                                                   target:self
                                                                                   action:@selector(onCancel:)];
diff --git a/BSModalPickerView/BSModalPickerView.m b/BSModalPickerView/BSModalPickerView.m
index 716d46c..704215e 100644
--- a/BSModalPickerView/BSModalPickerView.m
+++ b/BSModalPickerView/BSModalPickerView.m
@@ -59,6 +59,7 @@ - (void)setValues:(NSArray *)values {
 - (void)setSelectedIndex:(NSUInteger)selectedIndex {
     if (_selectedIndex != selectedIndex) {
         _selectedIndex = selectedIndex;
+        _indexSelectedBeforeDismissal = selectedIndex;
         if (self.picker) {
             UIPickerView *pickerView = (UIPickerView *)self.picker;
             [pickerView selectRow:selectedIndex inComponent:0 animated:YES];