fixed #issue 620