Fixed #268