Implement #375