diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index e9b5f98d0b..ddfacf1603 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -67,6 +67,7 @@ class BBCode extends BaseObject
 					$post["after"] = trim(substr($body, $pos + strlen($data[0])));
 				} else {
 					$post["text"] = trim(str_replace($data[0], "", $body));
+					$post["after"] = '';
 				}
 
 				$attacheddata = $data[2];
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 0a97c11c13..7b661d863f 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -850,7 +850,7 @@ class Worker
 		}
 
 		if (!empty($waiting)) {
-			$priority =  array_shift(array_keys($waiting));
+			$priority = array_keys($waiting)[0];
 			Logger::info('No underassigned priority found, now taking the highest priority.', ['priority' => $priority]);
 			return $priority;
 		}