diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index 6a6a669c0..5ae2c6049 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -716,7 +716,7 @@ class e_bbcode
 				$cls = array();
 				foreach($tmp as $v)
 				{
-					if($v === 'img-rounded' || $v === 'rounded' || $v === 'bbcode' || $v === 'bbcode-img-news' || $v === 'bbcode-img')
+					if($v === 'img-rounded' || $v === 'rounded' || strpos($v,'bbcode') === 0 )
 					{
 						continue;
 					}