Fix act-1589

Patch for act-1589