diff --git a/p4src/checksums.p4 b/p4src/checksums.p4
index c729f3c..40f4e43 100644
--- a/p4src/checksums.p4
+++ b/p4src/checksums.p4
@@ -22,7 +22,7 @@ control MyVerifyChecksum(inout headers hdr, inout metadata meta) {
 control MyComputeChecksum(inout headers  hdr, inout metadata meta) {
     apply {
 
-        update_checksum_with_payload(meta.chk_icmp6,
+        update_checksum_with_payload(meta.chk_icmp6 == true,
 		 	{
                 hdr.ipv6.src_addr,         /* 128 */
 		 		hdr.ipv6.dst_addr,         /* 128 */
@@ -37,7 +37,7 @@ control MyComputeChecksum(inout headers  hdr, inout metadata meta) {
         );
 
         /* checksumming for icmp6_na_ns_option */
-        update_checksum_with_payload(meta.chk_icmp6_na_ns,
+        update_checksum_with_payload(meta.switch_task == true,
 		 	{
                 hdr.ipv6.src_addr,         /* 128 */
 		 		hdr.ipv6.dst_addr,         /* 128 */
@@ -61,7 +61,7 @@ control MyComputeChecksum(inout headers  hdr, inout metadata meta) {
             HashAlgorithm.csum16
         );
 
-        update_checksum_with_payload(meta.chk_icmp,
+        update_checksum_with_payload(meta.chk_icmp == true,
 		 	{
                 hdr.icmp.type,
                 hdr.icmp.code