diff --git a/XilinxProcessorIPLib/drivers/nandps8_v2_0/src/xnandps8_bbm.c b/XilinxProcessorIPLib/drivers/nandps8_v2_0/src/xnandps8_bbm.c
index e37153dc..7cb36bb6 100755
--- a/XilinxProcessorIPLib/drivers/nandps8_v2_0/src/xnandps8_bbm.c
+++ b/XilinxProcessorIPLib/drivers/nandps8_v2_0/src/xnandps8_bbm.c
@@ -794,9 +794,9 @@ static s32 XNandPs8_WriteBbt(XNandPs8 *InstancePtr, XNandPs8_BbtDesc *Desc,
 	/*
 	 * Copy the signature and version to the Buffer
 	 */
-	memcpy(Buf , &Desc->Signature[0],
+	memcpy(Buf + Desc->SigOffset, &Desc->Signature[0],
 							Desc->SigLength);
-	memcpy(Buf + Desc->SigLength, &Desc->Version[Target], 1U);
+	memcpy(Buf + Desc->VerOffset, &Desc->Version[Target], 1U);
 	/*
 	 * Write the Buffer to page offset
 	 */