Mac Laptop Control Click Bug

I am using a mac laptop WITHOUT A MOUSE. When I try to right click (the OSX default is control-click) it does not recognise it. It works fine in 1.5.2 and earlier. I check controls and "Use Item" is set to "Button 2" I click on it (to change it) then control click. It does not recognise it and just sets it to "LCONTROL" Happens on both SMP and Single-Player. Please fix, it almost completely stops me from playing minecraft.

Hope this helps,
ValiantPumpkin