Fix issue622