Start implementing #540
Implement #540