diff --git a/ExampleApp/ExampleApp/AppDelegate.m b/ExampleApp/ExampleApp/AppDelegate.m
index 1ec9fea..37823d2 100644
--- a/ExampleApp/ExampleApp/AppDelegate.m
+++ b/ExampleApp/ExampleApp/AppDelegate.m
@@ -47,8 +47,7 @@
 
 -(void) audioPlayerViewPlayFromHTTPSelected:(AudioPlayerView*)audioPlayerView
 {
-//	NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
-    NSURL* url = [NSURL URLWithString:@"file:///Users/tum/testaudio.aac"];
+	NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
     
     STKAutoRecoveringHttpDataSource* dataSource = [[STKAutoRecoveringHttpDataSource alloc] initWithHttpDataSource:(STKHttpDataSource*)[audioPlayer dataSourceFromURL:url]];
     
@@ -57,8 +56,7 @@
 
 -(void) audioPlayerViewQueueFromHTTPSelected:(AudioPlayerView*)audioPlayerView
 {
-//	NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
-    NSURL* url = [NSURL URLWithString:@"file:///Users/tum/testaudio.aac"];
+	NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
     
     STKAutoRecoveringHttpDataSource* dataSource = [[STKAutoRecoveringHttpDataSource alloc] initWithHttpDataSource:(STKHttpDataSource*)[audioPlayer dataSourceFromURL:url]];
     
diff --git a/ExampleApp/ExampleApp/AudioPlayerView.m b/ExampleApp/ExampleApp/AudioPlayerView.m
index df648d0..ec9ab7e 100644
--- a/ExampleApp/ExampleApp/AudioPlayerView.m
+++ b/ExampleApp/ExampleApp/AudioPlayerView.m
@@ -223,9 +223,9 @@
     
     SampleQueueId* queueId = (SampleQueueId*)queueItemId;
 
-//    NSLog(@"Requeuing: %@", [queueId.url description]);
+    NSLog(@"Requeuing: %@", [queueId.url description]);
 
-//    [self->audioPlayer queueDataSource:[self->audioPlayer dataSourceFromURL:queueId.url] withQueueItemId:[[SampleQueueId alloc] initWithUrl:queueId.url andCount:queueId.count + 1]];
+    [self->audioPlayer queueDataSource:[self->audioPlayer dataSourceFromURL:queueId.url] withQueueItemId:[[SampleQueueId alloc] initWithUrl:queueId.url andCount:queueId.count + 1]];
 }
 
 -(void) audioPlayer:(STKAudioPlayer*)audioPlayer didFinishPlayingQueueItemId:(NSObject*)queueItemId withReason:(AudioPlayerStopReason)stopReason andProgress:(double)progress andDuration:(double)duration
diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m
index 7a23f1d..eae4ef4 100644
--- a/StreamingKit/StreamingKit/STKAudioPlayer.m
+++ b/StreamingKit/StreamingKit/STKAudioPlayer.m
@@ -2249,6 +2249,8 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
         [self.delegate audioPlayer:self didFinishBufferingSourceWithQueueItemId:queueItemId];
     });
     
+    [fastApiQueue waitUntilAllOperationsAreFinished];
+    
     pthread_mutex_lock(&playerMutex);
     {
         BOOL stopping = NO;