diff --git a/Classes/PXListView.m b/Classes/PXListView.m
index fb802c5..431a18d 100644
--- a/Classes/PXListView.m
+++ b/Classes/PXListView.m
@@ -72,6 +72,7 @@ - (void)awakeFromNib
 
 - (void)dealloc
 {
+	[self setDelegate:nil]; // otherwise delegate is left observing notifications from deallocated PXListView
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 	
 	[_reusableCells release], _reusableCells = nil;
@@ -84,11 +85,7 @@ - (void)dealloc
 #pragma mark -
 #pragma mark Data Handling
 
-- (id<PXListViewDelegate>)delegate
-{
-    return _delegate;
-}
-
+@synthesize delegate = _delegate;
 - (void)setDelegate:(id<PXListViewDelegate>)delegate
 {
     [_delegate removeObserver:_delegate