Fix for recent MongoDB version