Raven db 2360

fixed Raven db 2360 and Raven db 2351