Fixing issue #278.