Part of fixing issue #367