address comments from issue #400