Implement #94