Re: fix issue #6