Implement #53