Implement #50 (really this time!)