Implement #305