Implement #405