diff --git a/OpenCL/m18900-pure.cl b/OpenCL/m18900-pure.cl
index be43662ae..ea1c94108 100644
--- a/OpenCL/m18900-pure.cl
+++ b/OpenCL/m18900-pure.cl
@@ -17,6 +17,16 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
+typedef struct android_backup_tmp
+{
+  u32  ipad[5];
+  u32  opad[5];
+
+  u32  dgst[10];
+  u32  out[10];
+
+} android_backup_tmp_t;
+
 typedef struct android_backup
 {
   u32 version;
@@ -65,7 +75,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa
   sha1_transform_vector (w0, w1, w2, w3, digest);
 }
 
-__kernel void m18900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, android_backup_t))
+__kernel void m18900_init (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t))
 {
   /**
    * base
@@ -137,7 +147,7 @@ __kernel void m18900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, android_back
   }
 }
 
-__kernel void m18900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, android_backup_t))
+__kernel void m18900_loop (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t))
 {
   const u64 gid = get_global_id (0);
 
@@ -222,7 +232,7 @@ __kernel void m18900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, android_back
   }
 }
 
-__kernel void m18900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, android_backup_t))
+__kernel void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t))
 {
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
diff --git a/src/modules/module_18900.c b/src/modules/module_18900.c
index 1b32385ec..9c7f4904b 100644
--- a/src/modules/module_18900.c
+++ b/src/modules/module_18900.c
@@ -42,15 +42,15 @@ u32         module_salt_type      (MAYBE_UNUSED const hashconfig_t *hashconfig,
 const char *module_st_hash        (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_HASH;         }
 const char *module_st_pass        (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS;         }
 
-typedef struct pbkdf2_sha1_tmp
+typedef struct android_backup_tmp
 {
   u32  ipad[5];
   u32  opad[5];
 
-  u32  dgst[8];
-  u32  out[8];
+  u32  dgst[10];
+  u32  out[10];
 
-} pbkdf2_sha1_tmp_t;
+} android_backup_tmp_t;
 
 typedef struct android_backup
 {
@@ -68,7 +68,7 @@ static const char *SIGNATURE_ANDROID_BACKUP = "$ab$";
 
 u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
 {
-  const u64 tmp_size = (const u64) sizeof (pbkdf2_sha1_tmp_t);
+  const u64 tmp_size = (const u64) sizeof (android_backup_tmp_t);
 
   return tmp_size;
 }