Fixing issue #316.