Added new patch for standalone