fixed #525