Implement #270