(#1653) - better test for server set event on the server