This should have better been done through some shared code
but it's not that obvious...