Added fix to wait for server startup