Implement #301