Implement #315