Implement #421
Implement #426