First step towards #76