diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
index 35b012c1..144b506e 100644
--- a/.github/workflows/clang.yml
+++ b/.github/workflows/clang.yml
@@ -1,7 +1,7 @@
 name: clang
 on:
   push:
-    branches: [ master ]
+    branches: [ feature/mem_cast ]
   pull_request:
     branches: [ master ]
 
@@ -18,6 +18,8 @@ jobs:
 
     - name: Build
       run: |
+        sudo apt-get update
+        sudo apt-get install -y "clang-9" "lldb-9" "lld-9" "clang-format-9"
         export CC=clang-9
         export CXX=clang++-9
         cmake -D BUILD_TESTS=ON ./
diff --git a/include/etl/mem_cast.h b/include/etl/mem_cast.h
index a10905da..3388d4ac 100644
--- a/include/etl/mem_cast.h
+++ b/include/etl/mem_cast.h
@@ -529,7 +529,9 @@ namespace etl
     //***********************************
     ETL_NODISCARD size_t alignment() const
     {
-      const uintptr_t p = reinterpret_cast<uintptr_t>(pbuffer);
+      typedef typename etl::smallest_uint_for_bits<sizeof(uintptr_t)* CHAR_BIT>::type type;
+
+      const type p = reinterpret_cast<type>(pbuffer);    
 
       return 1U << etl::count_trailing_zeros(p);
     }