Fixed size mismatch issue