This should be easy with #356
This should be easy with #356