fixed #326 fixed #202