Fixed issue with dual wield #596

Fixing issue with dual wield as outlined in #596.