fixed #468