Minor improvement to issue #269.