Implement #616