Restructured logic to correctly parse solo standalone messages