Patch for #1 Dummy issue