Now correctly works with server2.0