MASTER - Fix issue with mongo driver