Implement #268