bug fixing #53,#65