RavenDB-2113 fix for 2.5