fixed #468 #469