Implement #259