diff --git a/post.php b/post.php
index 41e93165..7ad7a7e1 100644
--- a/post.php
+++ b/post.php
@@ -1449,24 +1449,33 @@ function handle_post(){
         ));
     }
     
-    if ($config['try_smarter'] && $post['op'])
-        $build_pages = range(1, $config['max_pages']);
-    
-    if ($post['op'])
+    if ($post['op']) {
         clean($id);
+        
+        if ($config['try_smarter'])
+            $build_pages = range(1, $config['max_pages']);
     
-    event('post-after', $post);
-    
-    buildIndex();
-
-    // We are already done, let's continue our heavy-lifting work in the background (if we run off FastCGI)
-    if (function_exists('fastcgi_finish_request')) {
-        @fastcgi_finish_request();
-    }
+        event('post-after', $post);
+        
+        buildIndex();
+        
+        // We are already done and post is visible to others, let's continue our heavy-lifting work in the background (if we run off FastCGI)
+        if (function_exists('fastcgi_finish_request')) {
+            @fastcgi_finish_request();
+        }
 
-    if ($post['op']) {
         rebuildThemes('post-thread', $board['uri']);
+        
     } else {
+        event('post-after', $post);
+        
+        // We are already done and post is visible to others, let's continue our heavy-lifting work in the background (if we run off FastCGI)
+        if (function_exists('fastcgi_finish_request')) {
+            @fastcgi_finish_request();
+        }
+        
+        buildIndex();
+        
         rebuildThemes('post', $board['uri']);
     }
 }