fixed #545