Issue 1937 remote publisher fix