Implement #642