Implement #39