Implement #482