Re: Fix issue #622