Shouldn't Bond have brought more ammo?

When he invaded Baron Samedi's voodoo ritual and then Kanaga's underground lair of caves? I mean he only brought a Smith and Wesson which only held six shots, 3 of which he wasted on destroying the fake Baron Samedi statue? That place was surrounded by crazed villagers along with armed guards. And while I'm on the subject I understand that he wanted to defeated Kananga but why go down into the lair without any weapons (he apparently dropped the machete)? What was he seriously expecting to accomplish not to mention he brought Solitare with him meaning that was one more person he was going to have to protect/save.

Bond really didn't think that one through.