Implement #376