fixed #668