Implement #525