First step towards fixing #7