Implement #313