fixed #269 fixed #268