Minor tweaking issue #3