Fix 331

Fixing issue #331