diff --git a/src/elements/soap.c b/src/elements/soap.c
index 097aca411..c8b5078df 100644
--- a/src/elements/soap.c
+++ b/src/elements/soap.c
@@ -31,13 +31,13 @@ int update_SOAP(UPDATE_FUNC_ARGS)
 		{
 			if (parts[i].life<=0)
 			{
-				if ((parts[i].ctype&6) != 6 && parts[i].ctype>1)
+				if ((parts[i].ctype&6) != 6 && (parts[i].ctype&6))
 				{
 					int target;
 
 					target = i;
 
-					while((parts[target].ctype&6) != 6 && parts[target].ctype>1)
+					while((parts[target].ctype&6) != 6 && (parts[target].ctype&6))
 					{
 						if ((parts[target].ctype&2) == 2)
 						{