Implement #335