fixed #616