Fix #33 - mongo