Fix to Macro-fu checkin -- original did not work on VS2010