fixed to work with new version of server2