diff --git a/dec/decode_frame.c b/dec/decode_frame.c
index 944d154..69251e0 100644
--- a/dec/decode_frame.c
+++ b/dec/decode_frame.c
@@ -42,8 +42,8 @@ void clpf_frame(decoder_info_t *decoder_info){
   int width = decoder_info->width;
   int xpos,ypos,index,filter_flag,filter;
   int k,l,x0,x1,y0,y1;
-  int num_sb_hor = width/MAX_BLOCK_SIZE;
-  int num_sb_ver = height/MAX_BLOCK_SIZE;
+  int num_sb_hor = (width + MAX_BLOCK_SIZE - 1)/MAX_BLOCK_SIZE;
+  int num_sb_ver = (height + MAX_BLOCK_SIZE - 1)/MAX_BLOCK_SIZE;
 
   uint8_t *recY = decoder_info->rec->y;
   uint8_t *recU = decoder_info->rec->u;
diff --git a/enc/encode_frame.c b/enc/encode_frame.c
index 7b7b200..930ea16 100644
--- a/enc/encode_frame.c
+++ b/enc/encode_frame.c
@@ -57,8 +57,8 @@ void clpf_frame(encoder_info_t *encoder_info){
   uint8_t *orgY = encoder_info->orig->y;
   int stride_y = encoder_info->rec->stride_y;
   int stride_c = encoder_info->rec->stride_c;
-  int num_sb_hor = width/MAX_BLOCK_SIZE;
-  int num_sb_ver = height/MAX_BLOCK_SIZE;
+  int num_sb_hor = (width + MAX_BLOCK_SIZE - 1)/MAX_BLOCK_SIZE;
+  int num_sb_ver = (height + MAX_BLOCK_SIZE - 1)/MAX_BLOCK_SIZE;
   for (k=0;k<num_sb_ver;k++){
     for (l=0;l<num_sb_hor;l++){
       xpos = l*MAX_BLOCK_SIZE;