diff --git a/ps3/rgl/src/ps3/rgl_ps3_raster.cpp b/ps3/rgl/src/ps3/rgl_ps3_raster.cpp
index 51d42fd965..7630415bd6 100644
--- a/ps3/rgl/src/ps3/rgl_ps3_raster.cpp
+++ b/ps3/rgl/src/ps3/rgl_ps3_raster.cpp
@@ -750,10 +750,14 @@ void rglCreatePushBuffer(void *data)
    //add padding
    if ( bufferSize > 0 )
    {
-      int nopCount = ( program->constantPushBuffer + bufferSize ) - ( unsigned int * )rglGcmCurrent;
-      CellGcmContextData gcmContext;
+      CellGcmContextData gcmContext, *thisContext;
+      int i, nopCount;
+
+      nopCount = ( program->constantPushBuffer + bufferSize ) - ( unsigned int * )rglGcmCurrent;
       gcmContext.current = (uint32_t*)rglGcmCurrent;
-      cellGcmSetNopCommandUnsafeInline(&gcmContext, nopCount);
+      thisContext = &gcmContext;
+
+      rglGcmSetNopCommand(thisContext, i, nopCount);
       rglGcmCurrent = (typeof(rglGcmCurrent))gcmContext.current;
    }
 }